remove complex merges; Jesse will cover rebase