removing design folder
conflit resolved