resolve merge conflicts, silly vyki #76