Manual merge (cont.)