Fixed merge conflict
Updated version file