fixed conflict in head