remove detailed color scheme
ignore foreman
Add git conflicts from rtomayko