Fixed merging error and added som stuff...