merge conflict on test