Removed redundant code from previous conflict