merge with christian