I dislike changing other peoples commits on merge, I might accidentally break something. Please remove them, just from a style viewpoint :)