make some rough decorations
solve the conflict