conflict resolve merge fix #1