Removes merge confict issue