the only one that I really dislike is merge commit