finish styling links and resolve merge conflicts