Removed merge conflit lines