Merged the conflicted files manually