conflicts resolved, css fixed

bingo!
more conflicts resolved