mention Ubuntu merge bug