Ensure relatives path when resolving conflicts