fixed merge with master errors