[Oops] Fixed wrong merge