make setup executable
merging conflicts