Removed random git conflict lines