test master commit with conflict