EOD 21-12-2014
resolve conflict