cleaning up files
Fixing conflict and pulling changes