Johnny's Merge Errors