better colors
remove trailing whitespaces
bundle merge problem