Removed accidentally added conflicted lines