color within working dir
Resolved merge conflict