Hopefully sorted merge / commit / etc issues