view work
fixing merge