style things
resolve merge conflicts in views