Strange merge conflict fix