Add modifications to merge branches