Fixes to conflicts
Fixed files