Merge resolving fixed on Ubuntu