merge from waqas