Removing errors introduced by automerge