removed bin/*
merged conflicts