fixed bunch of conflicts