fixed minor post merge issues