use atom colors
fix merge conflict