resolve conflict in backlogController