No problem, you already rebased that might have been a pain. 
I could have fixed it myself also by merging by hand :-) 

Once it's corrected I'll merge ! Thanks.