Fixed merge conflicts, release versions