Script now ignores merge conflicts