Solved Merging Conflicts