fixed incomplete merge