set bin/* as executables
fix merge conflict