163: try peaceful merge