psychopy merge related changes