More bad merge fixing :(