merge problems (hopefully) resolved