Fixed conflicted files