pushing other necessary files for ghosts
removed conflict files