force merge commits on feature finish