some weird merge code was removed