Removing data folder and  solving other merge issues