whats not committed?
conflicts resolved
using FromFull and ToFull, saving both fields as arrays