editing views
merging conflicts