Merge conflicts fixed