[Koha] opac.css' not uptodate. Cannot merge.

Dear All

I have installed Koha 3.05.00.004 thorugh git. Now while updating the
version I am getting the error

>From git://git.koha-community.org/koha
 * [new tag]         3.02.02    -> 3.02.02
 * [new tag]         push       -> push
 * [new tag]         v3.02.03   -> v3.02.03
 * [new tag]         v3.02.04   -> v3.02.04
 * [new tag]         v3.02.05   -> v3.02.05
 * [new tag]         v3.02.06   -> v3.02.06
 * [new tag]         v3.02.07   -> v3.02.07
 * [new tag]         v3.02.08   -> v3.02.08
 * [new tag]         v3.02.09   -> v3.02.09
 * [new tag]         v3.02.10   -> v3.02.10
 * [new tag]         v3.04.00   -> v3.04.00
 * [new tag]         v3.04.01   -> v3.04.01
 * [new tag]         v3.04.02   -> v3.04.02
 * [new tag]         v3.04.03   -> v3.04.03
 * [new tag]         v3.04.04   -> v3.04.04
Updating 0252421..147ae6c
error: Entry 'koha-tmpl/opac-tmpl/prog/en/css/opac.css' not uptodate. Cannot
merge.

Kindly guide.

-- 
Thanks and Regards

Sandeep Bhavsar
Librarian
Dr.V.N.Bedekar Institute of Management Studies
Thane(W) 400601
MUMBAI. INDIA
@@@@@@@@@@@@@@@@@@@@@@@@@@
email    : sandeep.bhavsar@gmail.com
Mob     : 9029 345777
elibrary :http://www.vpmthane.org/im/elib/main.htm
@@@@@@@@@@@@@@@@@@@@@@@@@@