update projectView
fixing conflict