Fixing merge conflictions. *****Source currently not working*****

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