fix conflictions, libs definitions