Removed merge conflict markings

Signed-off-by: Tabor Kvasnicka <kamakwazee@hotmail.com>