fixed merging bug
fixed merging bug

cvondrick/vatic,gautamMalu/vatic,cvondrick/vatic,baylabs/vatic,baylabs/vatic,kod3r/vatic,weiliu89/vatic,baylabs/vatic,vovakkk/vatic,gautamMalu/vatic,vovakkk/vatic,johndoherty/vatic,cvondrick/vatic,dingnigefei/vatic,johndoherty/vatic,baylabs/vatic,vovakkk/vatic,kod3r/vatic,kod3r/vatic,johndoherty/vatic,kod3r/vatic,gautamMalu/vatic,johndoherty/vatic,dingnigefei/vatic,cvondrick/vatic,dingnigefei/vatic,dingnigefei/vatic,cvondrick/vatic,baylabs/vatic,kod3r/vatic,vovakkk/vatic,weiliu89/vatic,johndoherty/vatic,weiliu89/vatic,weiliu89/vatic,weiliu89/vatic,gautamMalu/vatic,gautamMalu/vatic,dingnigefei/vatic