Solved a few Merge Conflicts refs #2505