antlers version
resolve conflicts