Finishing cleaning up merge conflicts