fixing user messaging
merging conflicts