Removed duplicate lines created by resolving git conflicts badly...