Preparing for merge
Fix merge conflict