merge conflict has broken something :-/