fixed merge errors

!?