Removed git conflict files