removed code at conflict resolving added again