Optimised
Fix merge button