bug with columns: content disappears
merge remote changes