Cleanup bin/
Add git conflicts bin file