remove .anvil directory
resolve conflicts