Removed merge conflictmarkers