Resolved conflicts on FabutTest