Resolving some bad merge issues