Committ before attempted merge with Derrike