successfully merged, works now