Merge Conflicts Solved
Final Changes - Code