Remove hats & merge changes from branches