Resolved A lots of conflicts