Merge conflict
Remove crap