Add flip clock, resolve merge conflicts