test moar 123 123 really long1 long3 long2 long5 line test test test Hello Some emphasis, importance, and code. test console.log('!'); foo bar Merge, conflict No conflict