Removed conflict lines