fixed lines
merge manager1fixes