Why does this keep getting reverted on my merges!