Resolved merge conflict in frontend js