fixing
more conflicts fixed