I was having problem during conflict resolving as seen on my last diary. But it checked out that it was due to the fact that I was using the version that was not tested but it's now solved.