Resolve Previous Merge Conflicts