removed code at conflict added again manually