fixed merg issues in Secondscreen