changes b4 merge