fixed issues resulting from unresolved conflicts