merge, vim compliant
merging