merge conflict fix & bump version