Fix double return

Fix merge conflicts