resolved a lot of conflicts