Resolved conflicts
Added testing GUI