remove unwanted file
fix conflicts
remove unwanted files