conflict bug fixed