(^!&@$#&^! delete !!@^@^ trailing !@^&#$!& whitespace!!!)
The conflict merge will happen shortly after.