merged changed master all