Fixed some version control problems

Signed-off-by: Jedabero <jedabero@hotmail.com>