test commit- merge error

epeidi ipirxe problima me to merge sto master auto einai gia na iparxei
kapoi simeio na epanelthw se periptwsi problimatos
Merge branch 'thesis'