Weird Merge Bug