Merge warning fixed