resolve errors merge