fix VCS conflict