Fixed some conflicted files