fixed some merge conflicts, #18