addded more conflicts
another conflict...
removed the conflicting stuff