merged code
bug fixing the merge
bug fixes to merged code