Correct beam jones matrix off-diagonal terms
Fix merge conflict