modified BUGS
resolved conflicts