Fixed merge conflict on 2ff3a52