commiting cluster.sass ??
fixing merge conflict