Bug fixing
conficts solved