Local fixes for merging
merge