merging waqas branch