Fixed Merge Conflicts and others