commit so that can merge fetch
conflicts gone