Manual Merge conflicts fixed