completing customer management views
fix commit
fix merge conflict
update