Manual merge and work on the CRUD