Conflicts was resolved after merge