more conflicts fixed