Removed conflicted git repo files.