fixed merge changes on laptop C