fixed merge
deleted file