dog says woof
conflicts resolved