Merged/ResolvedConflicts

Try this.