stylz and stuff
resolve merge conflict