Correct merging
Fix merging issue