console log train art
resolve scripts merge conflict