Fix merge call