Fix error after conflict resolving