Fixing missing dependency
Adding missing merge resolving
Adding some spaces