fixed comment on background
fix merge of branches