Strange merge problem that duplicated some lines. Fixed now