Removed unresolved conflicts