Fix merge proper-like