Resolution merge bug