Fixed merge conflicts that created unusable code. ***CODE FIXED***

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