Change some messed up merges