add preliminary styling
resolve merge
resolve conflict