fix merge issues
WIP