First merge problem fixed (there are more)