Fix merge conflict
Add some styling
Remove unneccesarry file