Fix merge and documentation