Squashing for github