Squashing commits together