deleted ds_store from folder
merge conflicts fixed
Path prediction Bug fixed