added check for user operations
mergeconflict