Conflict merge - Web Project