automerge broke the wall so did some fixing