Fix conflict (#1149)