Fixed view error due to merge