Resolved merge conflict in feature fields