Fixed up conflicted files