added colouring depending on usr
tried to resolve conflict