merge dis pelasepalse

if you override setter and getter, then you need to @synthesize it