Resolved merge conflict in gmx_membed.c