fixed merge
changing for right files