trying to fix some conflict 3