fixed merge conflicts
fixed conflicsts