stylized & merge conflicts fixed