Added nomerge flag to prevent mod auto-merge