Fix bug & merge