fixed issue in conflict