Merge conflict fixed, again...