simplify smerge-mode activation code
simplify smerge-mode activation code

danrharms/harmsway,articuluxe/harmsway,articuluxe/harmsway,articuluxe/harmsway,articuluxe/harmsway,articuluxe/harmsway,danrharms/harmsway,danrharms/harmsway,articuluxe/harmsway,articuluxe/harmsway,danrharms/harmsway,articuluxe/harmsway,danrharms/harmsway,danrharms/harmsway