Resolved bugs in my modules
commit resolved conflits