Fixed the conflicted files...