merge changes to debug mission