Merge problem solved.