merged correctly this time
merging with detached head
deleted some merge stuff