Solved some Merge conflicts