modal fix
merging conflicts