conflict bug resolved