fixed merge conflict on removed file