Resolved conflicts changed to english
Added startscreen form