cleaning repo
merging conflicts