Fix conflict in Github sync