Fixed wrong merge conflict :boom: