Merge Conflicts fixed