conflict error fixing