Removed conflicted lines