corrected redundant code caused by merge