Merge conflicts, Running version