tried to create a conflict on a3
tried to resolve a conflict