ahdsld
fixed merge
did some color