Resolved conflict between two versions of same file