Merge behaved unexpectedly, fixing file