(inc) incomplete fix of merge issues