Closed Bitheral closed 2 years ago
Unable to merge with GitKraken
Resolved conflict by removing file from local repository
Unable to merge with GitKraken