Correcting conflicts

Corrected conflicts between working and commited files