resolved rebse conflicts