merge
deleted unnecessary files
Fixed merge conflict