Merge error somewhere causing duplicate method signature and implementation