Merge new code from branch