Merge changes by bram