feature finish shouldn't ever do ff merges