all conflicts fixed^^