jk- now merge fix