resolve merge
Starting with the styling