Removed conflict files and comments