new colors
base and edit merge conflict fixed
new merge