Add reflection on manual vs. automatic merge