merge c6f60939880583fb1fffeacdc077a8fb5e6200b3 and resolve conflict