Fixes to conflicts