removed redundant code from merge conflict