Added Automerge option, fixed last commit.