Fixes unresolved conflicts