resolving merge conflict patrick->master
merge conflict
decapitated a detached head