new Version
Merge Conflicts fixed